Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cluster] Move ColorControl cluster to a dedicated file #24727

Merged
merged 1 commit into from
Jan 30, 2023
Merged

[cluster] Move ColorControl cluster to a dedicated file #24727

merged 1 commit into from
Jan 30, 2023

Conversation

vivien-apple
Copy link
Contributor

@vivien-apple vivien-apple commented Jan 30, 2023 •
edited
Loading

Problem

The ColorControl cluster definition lives in silabs/ha.xml, silabs/types-silabs.xml, silabs/zll.xml. That makes it harder that needed to look at it.
This PR moves the ColorControl cluster to a dedicated chip/color-control-cluster.xml file.
For color control types that are not speced but exists in the tree, those are moved to draft/types/color-control.xml.

@vivien-apple vivien-apple self-assigned this Jan 30, 2023
@vivien-apple vivien-apple force-pushed the Cluster_ColorControlClusterSingleFile branch from 31fef45 to 2994573 Compare January 30, 2023 09:11
@vivien-apple vivien-apple force-pushed the Cluster_ColorControlClusterSingleFile branch from 2994573 to 7faa5b5 Compare January 30, 2023 09:44
@github-actions
Copy link

github-actions bot commented Jan 30, 2023 •
edited
Loading

PR #24727: Size comparison from 4f24db4 to 7faa5b5

Increases (6 builds for bl602, psoc6, telink)
platform target config section 4f24db4 7faa5b5 change % change
bl602 lighting-app bl602 (read/write) 1345482 1345490 8 0.0
.text 1022518 1022522 4 0.0
bl602+rpc .text 1053452 1053454 2 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 27505916 27505917 1 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 27063668 27063669 1 0.0
lock cy8ckit_062s2_43012 .debug_info 22711757 22711758 1 0.0
telink ota-requestor-app tlsr9518adk80d text 604980 604982 2 0.0
Decreases (5 builds for bl702, cyw30739, esp32, nrfconnect, qpg)
platform target config section 4f24db4 7faa5b5 change % change
bl702 lighting-app bl702 (read/write) 1184951 1184935 -16 -0.0
.debug_info 40198120 40198119 -1 -0.0
.text 952354 952352 -2 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 585458 585450 -8 -0.0
.app_xip_area 461476 461468 -8 -0.0
esp32 all-clusters-app m5stack (read/write) 497827 497823 -4 -0.0
.flash.rodata 248904 248900 -4 -0.0
nrfconnect all-clusters-minimal-app nrf52840dk_nrf52840 text 774544 774540 -4 -0.0
qpg lock-app qpg6105+debug (read/write) 1116056 1116048 -8 -0.0
.text 563152 563144 -8 -0.0
Full report (43 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 4f24db4 7faa5b5 change % change
bl602 lighting-app bl602 (read/write) 1345482 1345490 8 0.0
.bss 94858 94858 0 0.0
.data 9736 9736 0 0.0
.text 1022518 1022522 4 0.0
bl602+rpc (read/write) 1390930 1390930 0 0.0
.bss 102906 102906 0 0.0
.data 10128 10128 0 0.0
.text 1053452 1053454 2 0.0
bl702 lighting-app bl702 (read only) 3358 3358 0 0.0
(read/write) 1184951 1184935 -16 -0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 70701 70701 0 0.0
.bss_psram 30048 30048 0 0.0
.comment 48 48 0 0.0
.data 4056 4056 0 0.0
.debug_abbrev 1549986 1549986 0 0.0
.debug_aranges 134056 134056 0 0.0
.debug_frame 490996 490996 0 0.0
.debug_info 40198120 40198119 -1 -0.0
.debug_line 5267150 5267150 0 0.0
.debug_loc 3401859 3401859 0 0.0
.debug_ranges 371928 371928 0 0.0
.debug_str 3535090 3535090 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 106704 106704 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 571692 571692 0 0.0
.symtab 173184 173184 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
952354 952352 -2 -0.0
bl702+rpc (read only) 3358 3358 0 0.0
(read/write) 1277579 1277579 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 78749 78749 0 0.0
.bss_psram 30304 30304 0 0.0
.comment 48 48 0 0.0
.data 4608 4608 0 0.0
.debug_abbrev 1698382 1698382 0 0.0
.debug_aranges 142280 142280 0 0.0
.debug_frame 518700 518700 0 0.0
.debug_info 44594411 44594411 0 0.0
.debug_line 5665475 5665475 0 0.0
.debug_loc 3597998 3597998 0 0.0
.debug_ranges 395632 395632 0 0.0
.debug_str 3938399 3938399 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 121232 121232 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 632289 632289 0 0.0
.symtab 191536 191536 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
1029340 1029340 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 677311 677311 0 0.0
(read/write) 174672 174672 0 0.0
.bss 81676 81676 0 0.0
.data 3384 3384 0 0.0
.rodata 87471 87471 0 0.0
.text 589524 589524 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 641391 641391 0 0.0
(read/write) 158368 158368 0 0.0
.bss 80868 80868 0 0.0
.data 3384 3384 0 0.0
.rodata 77423 77423 0 0.0
.text 563648 563648 0 0.0
lock-ftd LP_CC2652R7 (read only) 674379 674379 0 0.0
(read/write) 174948 174948 0 0.0
.bss 79108 79108 0 0.0
.data 3312 3312 0 0.0
.rodata 76267 76267 0 0.0
.text 597632 597632 0 0.0
lock-mtd LP_CC2652R7 (read only) 660727 660727 0 0.0
(read/write) 183864 183864 0 0.0
.bss 74372 74372 0 0.0
.data 3312 3312 0 0.0
.rodata 102735 102735 0 0.0
.text 557512 557512 0 0.0
pump-app LP_CC2652R7 (read only) 687443 687443 0 0.0
(read/write) 162612 162612 0 0.0
.bss 79068 79068 0 0.0
.data 3276 3276 0 0.0
.rodata 90395 90395 0 0.0
.text 596568 596568 0 0.0
pump-controller-app LP_CC2652R7 (read only) 672875 672875 0 0.0
(read/write) 177292 177292 0 0.0
.bss 79180 79180 0 0.0
.data 3300 3300 0 0.0
.rodata 86475 86475 0 0.0
.text 585920 585920 0 0.0
shell LP_CC2652R7 (read only) 668558 668558 0 0.0
(read/write) 185496 185496 0 0.0
.bss 83748 83748 0 0.0
.data 3380 3380 0 0.0
.rodata 84206 84206 0 0.0
.text 584040 584040 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 585458 585450 -8 -0.0
.app_xip_area 461476 461468 -8 -0.0
.bss 66432 66432 0 0.0
.data 736 736 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 589182 589182 0 0.0
.app_xip_area 459904 459904 0 0.0
.bss 71720 71720 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 550822 550822 0 0.0
.app_xip_area 432328 432328 0 0.0
.bss 60984 60984 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rpc (read/write) 974160 974160 0 0.0
.bss 147152 147152 0 0.0
.data 2196 2196 0 0.0
.text 824792 824792 0 0.0
BRD4161A+rs911x (read/write) 1037212 1037212 0 0.0
.bss 181632 181632 0 0.0
.data 2040 2040 0 0.0
.text 853520 853520 0 0.0
BRD4187C (read/write) 1151328 1151328 0 0.0
.bss 133652 133652 0 0.0
.data 2544 2544 0 0.0
.text 990536 990536 0 0.0
lock-app BRD4161A+wf200 (read/write) 1064836 1064836 0 0.0
.bss 153152 153152 0 0.0
.data 2048 2048 0 0.0
.text 909616 909616 0 0.0
window-app BRD4187C (read/write) 1146240 1146240 0 0.0
.bss 135164 135164 0 0.0
.data 2572 2572 0 0.0
.text 983908 983908 0 0.0
esp32 all-clusters-app c3devkit (read only) 1042096 1042096 0 0.0
(read/write) 1516178 1516178 0 0.0
.dram0.bss 76032 76032 0 0.0
.dram0.data 13792 13792 0 0.0
.flash.rodata 220136 220136 0 0.0
.flash.text 1042096 1042096 0 0.0
.iram0.text 72896 72896 0 0.0
m5stack (read only) 1094279 1094279 0 0.0
(read/write) 497827 497823 -4 -0.0
.dram0.bss 81080 81080 0 0.0
.dram0.data 34072 34072 0 0.0
.flash.rodata 248904 248900 -4 -0.0
.flash.text 1088895 1088895 0 0.0
.iram0.text 124855 124855 0 0.0
k32w contact k32w0+release (read/write) 660940 660940 0 0.0
.bss 77360 77360 0 0.0
.data 2112 2112 0 0.0
.text 562356 562356 0 0.0
light k32w0+release (read/write) 672884 672884 0 0.0
.bss 75144 75144 0 0.0
.data 2064 2064 0 0.0
.text 592948 592948 0 0.0
lock k32w0+release (read/write) 632320 632320 0 0.0
.bss 75912 75912 0 0.0
.data 2084 2084 0 0.0
.text 551596 551596 0 0.0
linux chip-tool-ipv6only arm64 (read only) 11041532 11041532 0 0.0
(read/write) 698024 698024 0 0.0
.bss 34248 34248 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 641448 641448 0 0.0
.dynamic 560 560 0 0.0
.got 14120 14120 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 576188 576188 0 0.0
.text 8812644 8812644 0 0.0
thermostat-no-ble arm64 (read only) 2506604 2506604 0 0.0
(read/write) 144680 144680 0 0.0
.bss 56456 56456 0 0.0
.data 1824 1824 0 0.0
.data.rel.ro 76968 76968 0 0.0
.dynamic 560 560 0 0.0
.got 5392 5392 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 150856 150856 0 0.0
.text 2093920 2093920 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2463256 2463256 0 0.0
.bss 215956 215956 0 0.0
.data 5880 5880 0 0.0
.text 1425900 1425900 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1165296 1165296 0 0.0
bss 147246 147246 0 0.0
rodata 133352 133352 0 0.0
text 804472 804472 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1366864 1366864 0 0.0
bss 106546 106546 0 0.0
rodata 210832 210832 0 0.0
text 763636 763636 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1111544 1111544 0 0.0
bss 146402 146402 0 0.0
rodata 110496 110496 0 0.0
text 774544 774540 -4 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 840808 840808 0 0.0
(read/write) 1755764 1755764 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 189864 189864 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2672 2672 0 0.0
.debug_abbrev 1251453 1251453 0 0.0
.debug_aranges 111280 111280 0 0.0
.debug_frame 373636 373636 0 0.0
.debug_info 27505916 27505917 1 0.0
.debug_line 3778983 3778983 0 0.0
.debug_loc 3673163 3673163 0 0.0
.debug_ranges 362248 362248 0 0.0
.debug_str 3485010 3485010 0 0.0
.heap 840808 840808 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 577246 577246 0 0.0
.symtab 424288 424288 0 0.0
.text 1554840 1554840 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 841624 841624 0 0.0
(read/write) 1697644 1697644 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 189056 189056 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1237164 1237164 0 0.0
.debug_aranges 110544 110544 0 0.0
.debug_frame 376080 376080 0 0.0
.debug_info 27063668 27063669 1 0.0
.debug_line 3787349 3787349 0 0.0
.debug_loc 3656893 3656893 0 0.0
.debug_ranges 360216 360216 0 0.0
.debug_str 3470763 3470763 0 0.0
.heap 841624 841624 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 538662 538662 0 0.0
.symtab 409728 409728 0 0.0
.text 1497536 1497536 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 849944 849944 0 0.0
(read/write) 1611196 1611196 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180936 180936 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2464 2464 0 0.0
.debug_abbrev 1072030 1072030 0 0.0
.debug_aranges 102800 102800 0 0.0
.debug_frame 346624 346624 0 0.0
.debug_info 22491101 22491101 0 0.0
.debug_line 3340154 3340154 0 0.0
.debug_loc 3336443 3336443 0 0.0
.debug_ranges 319440 319440 0 0.0
.debug_str 3274787 3274787 0 0.0
.heap 849944 849944 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 474072 474072 0 0.0
.symtab 377632 377632 0 0.0
.text 1419408 1419408 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 844960 844960 0 0.0
(read/write) 1645260 1645260 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185912 185912 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1073378 1073378 0 0.0
.debug_aranges 103184 103184 0 0.0
.debug_frame 348424 348424 0 0.0
.debug_info 22711757 22711758 1 0.0
.debug_line 3341884 3341884 0 0.0
.debug_loc 3358062 3358062 0 0.0
.debug_ranges 321296 321296 0 0.0
.debug_str 3291194 3291194 0 0.0
.heap 844960 844960 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 477007 477007 0 0.0
.symtab 379456 379456 0 0.0
.text 1448488 1448488 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1148352 1148352 0 0.0
.bss 100668 100668 0 0.0
.data 848 848 0 0.0
.text 595452 595452 0 0.0
lock-app qpg6105+debug (read/write) 1116056 1116048 -8 -0.0
.bss 97188 97188 0 0.0
.data 860 860 0 0.0
.text 563152 563144 -8 -0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1016676 1016676 0 0.0
bss 98776 98776 0 0.0
text 686128 686128 0 0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 953336 953336 0 0.0
bss 97824 97824 0 0.0
text 648508 648508 0 0.0
contact-sensor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 858792 858792 0 0.0
bss 89948 89948 0 0.0
text 579486 579486 0 0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 874564 874564 0 0.0
bss 90036 90036 0 0.0
text 593612 593612 0 0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 951888 951888 0 0.0
bss 98184 98184 0 0.0
text 659008 659008 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 888732 888732 0 0.0
bss 90984 90984 0 0.0
text 604980 604982 2 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 878780 878780 0 0.0
bss 91424 91424 0 0.0
text 595190 595190 0 0.0

@andy31415
Copy link
Contributor

@vivien-apple should the color control cluster types be associated with the color control instead of being free standing?

@vivien-apple
Copy link
Contributor Author

@vivien-apple should the color control cluster types be associated with the color control instead of being free standing?

Do you mean the types in draft/types/color-control.xml ? If so, and looking at the specification, those are not fully specified yet.

@bzbarsky-apple bzbarsky-apple merged commit 4649eac into project-chip:master Jan 30, 2023
lecndav pushed a commit to lecndav/connectedhomeip that referenced this pull request Mar 22, 2023
@vivien-apple
[cluster] Move ColorControl cluster to a dedicated file (project-chip…
ade031d 
…#24727)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@yufengwangca yufengwangca yufengwangca approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@amitnj amitnj Awaiting requested review from amitnj

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@pjzander-signify pjzander-signify Awaiting requested review from pjzander-signify

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees

@vivien-apple vivien-apple

Labels
app github review - approved scripts workflows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vivien-apple @andy31415 @yufengwangca @bzbarsky-apple